Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Очереди на мк и перенос сгущенки #337

Merged
merged 16 commits into from
Aug 25, 2024
Merged

Очереди на мк и перенос сгущенки #337

merged 16 commits into from
Aug 25, 2024

Conversation

ne4t02
Copy link
Contributor

@ne4t02 ne4t02 commented Aug 23, 2024

Описание PR

Добавлены очереди для МК-58 и перенесена сгущенка Петра

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑 Ne4to_

  • add: Добавлен режим стрельбы очередями для МК-58
  • add: По просьбам сладкоежек вновь добавлена сгущенка

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации and removed Merge Conflict labels Aug 23, 2024
@ne4t02 ne4t02 requested a review from 1Stepka1 August 23, 2024 19:39
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 23, 2024 •
edited
Loading

RSI Diff Bot; head commit f0560c6 merging into edb8cc1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi

State Old New Status
icon-open Added
icon Added
trash Added

Edit: diff updated after f0560c6

1Stepka1
1Stepka1 previously requested changes Aug 23, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Делов не на долго, думаю справишься

Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml Outdated Show resolved Hide resolved
Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/meta.json Outdated Show resolved Hide resolved
@ne4t02 ne4t02 requested a review from 1Stepka1 August 24, 2024 08:24
@1Stepka1 1Stepka1 dismissed their stale review August 24, 2024 12:01

Требования выполнены

@1Stepka1
Copy link
Collaborator

Если что не забудь почистить дубликаты с прошлых измениний

Bolper
Bolper reviewed Aug 24, 2024
View reviewed changes
Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Просто вопросики ибо я хочу уже спатькать а не делать ревью

Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl Outdated
@@ -0,0 +1,3 @@
reagent-name-condensedmilk = сгущенное молоко
reagent-desc-condensedmilk = белая густая и очень сладкая жидкость
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Хм... Если это реагенты то почему они не в реагентах..

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Верно

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

довольный мяф

@Darkiich Darkiich added this pull request to the merge queue Aug 25, 2024
Merged via the queue into AdventureTimeSS14:master with commit 9fe32bf Aug 25, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bolper Bolper Bolper left review comments

@1Stepka1 1Stepka1 1Stepka1 approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ne4t02 @1Stepka1 @Bolper @Darkiich